From 4e3d9aacfee6b89f5460540cabab2580a3d747fe Mon Sep 17 00:00:00 2001 From: Jeroen van der Heijden Date: Thu, 3 Jan 2019 21:25:27 +0100 Subject: [PATCH] No error in case series do not exist, #112 --- itest/test_select_ns.py | 2 +- itest/test_series.py | 5 +++++ src/siri/db/listener.c | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/itest/test_select_ns.py b/itest/test_select_ns.py index 5d815c29..0ab80229 100644 --- a/itest/test_select_ns.py +++ b/itest/test_select_ns.py @@ -102,7 +102,7 @@ TIME_PRECISION = 'ns' class TestSelectNano(TestBase): - title = 'Test select and aggregate functions' + title = 'Test select and aggregate functions (ns)' GEN_POINTS = functools.partial( gen_points, n=1, time_precision=TIME_PRECISION) diff --git a/itest/test_series.py b/itest/test_series.py index 384b83ff..3a19e81e 100644 --- a/itest/test_series.py +++ b/itest/test_series.py @@ -107,6 +107,11 @@ class TestSeries(TestBase): 'select * from "string", "integer", "double"'), expected) + self.assertAlmostEqual( + await self.client0.query( + 'select * from "x", "string", "integer", "double", "nexist"'), + expected) + self.client0.close() diff --git a/src/siri/db/listener.c b/src/siri/db/listener.c index 2aea352a..b74c9f54 100644 --- a/src/siri/db/listener.c +++ b/src/siri/db/listener.c @@ -1183,6 +1183,7 @@ static void enter_series_name(uv_async_t * handle) if (pool == siridb->server->pool) { series = (siridb_series_t *) ct_get(siridb->series, series_name); +#ifdef SERIESMUSTEXIST if (series == NULL) { /* the series does not exist */ @@ -1193,6 +1194,7 @@ static void enter_series_name(uv_async_t * handle) siridb_query_send_error(handle, CPROTO_ERR_QUERY); return; } +#endif } else if (q_wrapper->pmap != NULL && imap_set( q_wrapper->pmap, -- 2.30.2